Use a define for the default theme name

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 0bb2dec8a1dbd9c7203cfb7b9defb07085bc3f02..4ea4282628f487bcc2094c8774dd582b1865e6c3 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -34,6 +34,7 @@
 #include "gtkcssselectorprivate.h"
 #include "gtkcssshorthandpropertyprivate.h"
 #include "gtkcssstylefuncsprivate.h"
+#include "gtksettingsprivate.h"
 #include "gtkstyleprovider.h"
 #include "gtkstylecontextprivate.h"
 #include "gtkstylepropertiesprivate.h"
@@ -2838,9 +2839,9 @@ _gtk_css_provider_load_named (GtkCssProvider *provider,
         }
       else
         {
-          /* Worst case, fall back to Raleigh */
-          g_return_if_fail (!g_str_equal (name, "Raleigh")); /* infloop protection */
-          _gtk_css_provider_load_named (provider, "Raleigh", NULL);
+          /* Worst case, fall back to the default */
+          g_return_if_fail (!g_str_equal (name, DEFAULT_THEME_NAME)); /* infloop protection */
+          _gtk_css_provider_load_named (provider, DEFAULT_THEME_NAME, NULL);
         }
     }
 }

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index c90db5085235837077139b58cd968c5765c19ab3..7e7028d50d6e2cfcc2712d70bee80751e311bc0b 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -435,7 +435,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
 #ifdef G_OS_WIN32
                                                                  _gtk_win32_theme_get_default (),
 #else
-                                                                  "Raleigh",
+                                                                  DEFAULT_THEME_NAME,
 #endif
                                                                   GTK_PARAM_READWRITE),
                                              NULL);
@@ -2984,7 +2984,7 @@ get_theme_name (GtkSettings *settings)
     return theme_name;
 
   g_free (theme_name);
-  return g_strdup ("Raleigh");
+  return g_strdup (DEFAULT_THEME_NAME);
 }
 
 static void

diff --git a/gtk/gtksettingsprivate.h b/gtk/gtksettingsprivate.h
index cef7ca6e04ce3e96da71d2ce331ce20b05a62024..bb21d9d5ab8cd9207c30cf4abfb72ead8488e958 100644 (file)
--- a/gtk/gtksettingsprivate.h
+++ b/gtk/gtksettingsprivate.h
@@ -22,6 +22,7 @@
 
 G_BEGIN_DECLS
 
+#define DEFAULT_THEME_NAME      "Raleigh"
 
 void                _gtk_settings_set_property_value_from_rc (GtkSettings            *settings,
                                                               const gchar            *name,